Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Feb 2011 19:31:01 +0000 (11:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Feb 2011 19:31:01 +0000 (11:31 -0800)
commit425bab6a65c9fcb2276f93c05f258ed08755b44e
treec045462c85ec058a25ab9e49c475e42e2ea9fb01
parent8d6c46cd06c1e17eddbd73518ab91b17302c2cf3
parentc82c91fb473e50930e59e4322c79993e5707e4e9
Merge from mainline.
ChangeLog
src/ChangeLog